Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Dec 2011 02:04:59 +0000 (18:04 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Dec 2011 02:04:59 +0000 (18:04 -0800)
commit5baeca6743585c5f776d0168d2902a0b8cddb376
tree6a48517574d6bb2e9bbfc50e8d961fb3d5ffddaa
parentc1db29b6945dbd9a3975fe1d8ed7663bd5085500
parent31ab50cd04909b4f1a7be969179f174476bbef41
Merge from trunk.